xl: tidy up around global '-v' option

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>

diff --git a/tools/libxl/xl.c b/tools/libxl/xl.c
index d00dcefe1d46ab3163174d33116a19f4ccb5057b..496eb54c331111b3282034087aea4f297cf13a99 100644 (file)
--- a/tools/libxl/xl.c
+++ b/tools/libxl/xl.c
@@ -74,7 +74,7 @@ int main(int argc, char **argv)
     if (cspec)
         return cspec->cmd_impl(argc, argv);
     else if (!strcmp(cmd, "help")) {
-        help(argv[2]);
+        help(argv[optind]);
         exit(0);
     } else {
         fprintf(stderr, "command not implemented\n");

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index b0e1341aeb2fa55c7d9887d74f655d0e7dab821d..b506d816dbb38bca99589e80f1f407708932f720 100644 (file)
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -1285,7 +1285,7 @@ void help(char *command)
     struct cmd_spec *cmd;
 
     if (!command || !strcmp(command, "help")) {
-        printf("Usage xl <subcommand> [args]\n\n");
+        printf("Usage xl [-v] <subcommand> [args]\n\n");
         printf("xl full list of subcommands:\n\n");
         for (i = 0; i < cmdtable_len; i++)
             printf(" %-20s%s\n",
@@ -1293,7 +1293,7 @@ void help(char *command)
     } else {
         cmd = cmdtable_lookup(command);
         if (cmd) {
-            printf("Usage: xl %s %s\n\n%s.\n\n",
+            printf("Usage: xl [-v] %s %s\n\n%s.\n\n",
                    cmd->cmd_name,
                    cmd->cmd_usage,
                    cmd->cmd_desc);